d8de35990548b21aefaefc482ada2dfc0f265d2a,src/org/pentaho/di/job/entries/unzip/JobEntryUnZip.java,JobEntryUnZip,getTargetFilename,#String#,1209
Before Change
retval=retval.substring(0, lastindexOfDot);
SimpleDateFormat daf = new SimpleDateFormat();
Date now = new Date();
if(SpecifyFormat && !Const.isEmpty(date_time_format))
{
daf.applyPattern(date_time_format);
String dt = daf.format(now);
retval+=dt;
}else
{
if (adddate)
{
daf.applyPattern("yyyyMMdd");
String d = daf.format(now);
retval+="_"+d;
}
After Change
String filename=file.getName().getPath();
// Replace possible environment variables...
if(filename!=null) retval=filename;
if(file.getType()!= FileType.FILE) return retval;
int lenstring=retval.length();
int lastindexOfDot=retval.lastIndexOf('.');
if(lastindexOfDot==-1) lastindexOfDot=lenstring;
retval=retval.substring(0, lastindexOfDot);
if(!SpecifyFormat && !adddate && !addtime) return retval;
if(daf==null) daf = new SimpleDateFormat();
Date timestamp = new Date();
if(addOriginalTimestamp) timestamp=new Date(file.getContent().getLastModifiedTime());
if(SpecifyFormat && !Const.isEmpty(date_time_format)){
if(!dateFormatSet) daf.applyPattern(date_time_format);
String dt = daf.format(timestamp);
retval+=dt;
}else {
if (adddate) {
if(!dateFormatSet) daf.applyPattern("yyyyMMdd");
String d = daf.format(timestamp);
retval+="_"+d;
}